Revert 19bb97a..c5a1e27

This rolls back to commit 19bb97aff7ba1c3f193b5434debcc67ef47e5ada.