Revert ba0e4ec..39e28f8

This rolls back to commit ba0e4ec27be2f9635fa9e38db68c42d23403c945.