Revert b67b0f6..13a4938

This rolls back to commit b67b0f6ab63ed00c612aef0cb2a44b3e64092533.