Reverted earlier changes, issues remain that if you use @Transactional, advisory lock and custom timeout support may not work, fast solution was not good enough.