Revert 94343e6..6f0b9cd

This rolls back to commit 94343e681476c6faf6213b3431ee76a975e473f6.