Neymer hardcoding hack
Merge commit 'c57908b5de7af09aebb4ed769d8cb20f38783af9'