Revert 6f14e4c..55ea774

This rolls back to commit 6f14e4c7df884a4dd7a4a1e9bdd213b8a5781027.