Revert ca4b237..a440bff

This rolls back to commit ca4b2376e998ab2b90e61d6c9afe02ea55704494.