Revert d058290..af9c8f8

This rolls back to commit d058290d84e25215e00ba7c471e3455fa51c1494.