Revert fba4462..b4e98e5

This rolls back to commit fba4462d40b5837858c06d820e76af7c8c4a0247.