Revert f84ac1a..cf16a30

This rolls back to commit f84ac1a482a140d23199616093c2c1204fcf8aef.