Revert 658c1f1..8864008

This rolls back to commit 658c1f11e5b9c3d0ac6cf8412ef3704af54d539a.