Revert e10a27e..4144258

This rolls back to commit e10a27ebf00e8327309b9e757ad83f748f67b429.