Revert be2ba2d..effe734

This rolls back to commit be2ba2d07289c53bb6d3b3b19aa3216d07e477fc.