Revert "Revert "second attempt""

This reverts commit 0bb85104ef95723ae52a1dd6fcefbc17a420805e.