Revert 299cd5d..aaaad84

This rolls back to commit 299cd5d042efd337c3c96b80a93a98605a685077.