Reverting previous fix.