Revert 25b8458..d4ed911

This rolls back to commit 25b8458cf746b66027dc7fa604b4ab8c0d3dce81.