Revert c69d980..291c2d7

This rolls back to commit c69d980267655d87338cdd538d4faa86278a2f01.