evert "Merge tag '1.0.5' into develop"

This reverts commit 1279e94349add43f69627383520268d787836fc1, reversing
changes made to ffd675e4734aa7ff04d9960ab89152462d5b4720.