Revert 68d21cf..cb43ed8

This rolls back to commit 68d21cf369487aac443205b1f2eb63cbeacb5460.