Fixes DEVELOPER-462

Currently going with the '*' (wildcard at the end) approach per Paul
Did you mean to leave in this commented out code?