Revert b582601..f221c0f

This rolls back to commit b5826011c5d5af71f6b3781200482dbb6825bb44.