Revert c873cb2..e2aac0f

This rolls back to commit c873cb23222c7a43cb19ffa3f588fb3d26749e7f.