Revert 8d54623..5ea14af

This rolls back to commit 8d54623cad9645583d90cfc69fd4f6e953e979f1.