Revert 3653a9d..9fd0453

This rolls back to commit 3653a9dedd47cb937255435bce73d4fc7ad3db06.