Revert dba2d86..918a2e4

This rolls back to commit dba2d8679559e4804bb0dbdd523e7e081f3482c3.