Revert 69cd8cd..f1c6213

This rolls back to commit 69cd8cd62f0b64fb18fe1b4d0dcb3fa080358fa9.