Revert 622df09..0b0c89c

This rolls back to commit 622df09c44146b57f858b17c6d6740f0ad23721d.