Revert cd34b6e..7919fcc

This rolls back to commit cd34b6e4907e37b57c217c939b6560978e0bd041.