Revert c7dd27b..f591b54

This rolls back to commit c7dd27bafd6a7a8beab1651fcc80bf104b0bfb32.