Revert 3330d54..c037ded

This rolls back to commit 3330d54e53254a17c68ea0704c3590206ef81c38.