Revert 6ea9cf4..698a307

This rolls back to commit 6ea9cf49ababca4a7b4fddc561ceab5cc479a68e.