Revert 18c6826..85f8d68

This rolls back to commit 18c6826a7803340a9f59a7adf14d8e878e8b9938.