Revert 9e32943..599aa60

This rolls back to commit 9e329439150c9ac98152a256d00f775ce0349271.