Revert e9c49ec..41eead6

This rolls back to commit e9c49ec00222d3e2a28e37654c9cc2fe2edee144.