Revert 80f8284..7644750

This rolls back to commit 80f82842aa84272122bb59a811f58ccc6870b0e6.