Revert b9942ea..5048ad6

This rolls back to commit b9942ea9703e23e57d6aeb99e3a8a668cc8f05b1.