Revert 3985b4e..e3ea298

This rolls back to commit 3985b4ef321d1a72fe26521269aebf55aacadf55.