LPS-33110 reverting previous way of adding first/last class