Revert d3ffa04..1db7ac3

This rolls back to commit d3ffa04770950bcf0633702d0dc800808dae9424.