2 Commits (revert-CLDC-2310)