Revert 99e69df..f20c499

This rolls back to commit 99e69df29ff165fd012f2b6a2f831a18686453d7.