Revert e647464..21005c2

This rolls back to commit e647464834fbf7a526afef9fd928831ea05bb2f1.