Reverting previous commit
Going to wait until the jQuery conversion before resubmitting this