Revert 98a5ab1..31691ea

This rolls back to commit 98a5ab1a0464244c55d833ac54042b85f5055a74.