Revert 4c79f68..1019b58

This rolls back to commit 4c79f688bebb6150456ddaf95f5d287317ec8346.