Revert 9fffe16..31ab4e2

This rolls back to commit 9fffe16fa2cac3c21166ab63e13f79e4a930b4f2.