Sorry, DO NOT MERGE

"Fixes CG-CamSys/Backlog#54"