Revert 1dc398f..4523454

This rolls back to commit 1dc398facb47e9c6cc4a69e3a3e98fb010ffbfac.