Revert 72048c5..97553f9

This rolls back to commit 72048c5b3e5f9e8b7af959a2480f9a39fcee2831.