Revert 3d82592..4298dd1

This rolls back to commit 3d82592bc4729ab8048de42605c4d4ae5490af51.