Revert d6e0bb0..5ce628f

This rolls back to commit d6e0bb03ec6ca6c2925be1d5ff636ff9f18ec62e.