Revert 6389173..d61b4eb

This rolls back to commit 6389173f167bd2fed17b3b7bba48ba27068010f2.