Revert befc425..3607921

This rolls back to commit befc425cd66f3f3088a5f1536a5d9da23f252866.