[COMMIT] Revert a couple of changes from those last commits