Reverted shot's last commit to move it to his dev branch