Closes #497 by removing the problematic ID.
Merge commit 'e72dc63cdc41c51f52d60b78a941da6017d83141' into HEAD