Revert 5ec42c1..1c2023d

This rolls back to commit 5ec42c1c2ea03b7c3b99a85c8f46b5f9b5fb6132.