Revert 8ba56ba..b6d123d

This rolls back to commit 8ba56bae0fe74ebe12bdf4d87b739d82fc49d7cd.