Revert d57f831..d5a74ec

This rolls back to commit d57f83117c6aba5660ab35ede777de6aa9f27607.