Revert 96fbec9..80e7eaf

This rolls back to commit 96fbec9c13b8e4e351125263fac56814d63495a9.