Revert d1e6a75..7c54dce

This rolls back to commit d1e6a7552239e3fb941dbab21e3e847f93add830.