Revert 0926d68..dba2736

This rolls back to commit 0926d686d35009d6e51ac5686497c6b23e77a4aa.