Reverting my changes for #245