Revert cb7ab59..1cec71e

This rolls back to commit cb7ab597ea2ea91281395a76afbeeb69ca58bf37.