Revert 5fb7f35..dfeb6c9

This rolls back to commit 5fb7f3511b37e676002cf0eaef4a81a6ea6cddb2.