Revert 18552ff..dcd5507

This rolls back to commit 18552ff9f9eaeda7342af68fce9f23598033996e.