Revert 2f13d7e..80c5e5b

This rolls back to commit 2f13d7ecfd1d60d73544160ff03927e9df68e8d4.