Revert 72e5b2f..3b498b9

This rolls back to commit 72e5b2f1acebe9f8c76b69984a17c720dd58fc72.