Revert 22530c5..da0f68f

This rolls back to commit 22530c5ebea20bcf0631f0d33f32adb76c6673d7.