Revert bca34ba..152b655

This rolls back to commit bca34baed991974f05d7762d785a02239f66bd68.