Revert 636d0fe..8c5bc27

This rolls back to commit 636d0fecfffd37c2d0ca4e30106b7cd2371ba29b.