I'd like to revert the original fast-locking change and later replace it with the reworked fast-locking (https://github.com/openjdk/jdk/pull/10590). This new version can be turned on/off by a runtime flag, and is also more efficient.