Revert ed54fb8..fe11c31

This rolls back to commit ed54fb8df68d55ab781daceb64b41a4e83ef2a0c.