Reverted 1220a, 0ce7b, b3496, and 42d6ab