Revert 2f2385a..60a2de8

This rolls back to commit 2f2385ad6acca1ff1f8d74ef475510fd3ed0aad3.