Revert 339675b..22594e2

This rolls back to commit 339675b2f7203b6c6ea7331600ce2ba90ba8c2ed.