Revert c952869..a01882e

This rolls back to commit c9528696265301dba8c428b1f727f08fb3b22aad.