Revert 9453f2b..68c8794

This rolls back to commit 9453f2be5b02764dcf9a34bd22e83e3dca505641.