Revert 37da3aa..738bc81

This rolls back to commit 37da3aaa167dbd6d292bf2ed528b2419e8a9c0e7.