Revert baba877..8527d9c

This rolls back to commit baba8772475a5dc84b5ba1f9b9e2e6dc1eb73149.