Revert e6d10ae..5f58315

This rolls back to commit e6d10ae19860c1448474ee7ed0b22ab263abefa2.