Revert eee5d24..b9794d2

This rolls back to commit eee5d243925c635ab628dec3261c79e22ede61bf.