Revert "Revert "Revert "Revert "Minor changes""""

This reverts commit ebd82ec8a0f76851c86a12a6cf219a0f502546d0.