Revert 17fe7c1..5aaf2c9

This rolls back to commit 17fe7c103aca05013c24fa56edad1a805df61c82.