Bug rhbz#1097457 - Limit the scope of the previous fix and include a helpful comment