Revert 360634f..7599631

This rolls back to commit 360634fad4add0465c46f16d03a88d28358f3d48.