Revert a879523..f1f6568

This rolls back to commit a879523f8ed62f31d991dba8d0bbe9c026b8f79d.