Revert a71b1bc..1b0c79d

This rolls back to commit a71b1bc9a160b52297db2b5167422bc6e60e3438.