Revert f6b2f73..f9bc450

This rolls back to commit f6b2f7356acd7132608b73457301a0f8568e84d7.