Revert last commit

This reverts commit 84367a77f7fc9bf3506a9acbf032eb83e94ff8d5.