Revert a489b53..83510d8

This rolls back to commit a489b53f92ce8bfdf31c4cf0c525904bdb52ccbb.