Revert 7ce4279..8bec853

This rolls back to commit 7ce4279f8ac90ddd4ae8afece0dac103475d9434.