Revert e3bd6d5..042c669

This rolls back to commit e3bd6d55376f9bcd9606083e53edc20f5e7a46cd.