Revert b05d79e..ebd7e26

This rolls back to commit b05d79e688df8bb49bb25992975f48754c5d64f0.