Revert f44c902..ca22ea7

This rolls back to commit f44c902065c4a0bd04f9dc01aefc8dc1130df839.