Revert a641373..b440957

This rolls back to commit a64137334a58ffb2975b2dfdb6e9a47963802def.