Revert cf3109b..d38c4d7

This rolls back to commit cf3109beeffc68c55f82f7c9fe89901fd141ef91.