Revert 24df3fa..246360f

This rolls back to commit 24df3fad705de90f2b3c42109ec16dd127c70a63.