Undo renaming, as it would dramatically increase maintainability of this forked-gem over time