Revert 7eb3e2a..be960a7

This rolls back to commit 7eb3e2a13a223d3dded690bccac940f01d8842e1.