Revert f948729..59f8584

This rolls back to commit f94872941f4f833e2f1feb88c2ef1c43d83a88b4.