Revert 1070225..d9af94c

This rolls back to commit 10702255aac3bfd996f26e7d14ae06b8cb9d7dfb.