Revert b22f7cf..5109f40

This rolls back to commit b22f7cf916770be6dcc08e06fd149e594ceabc01.