Revert "Remove custom whenever command"

This reverts commit 07d2f360a4eed908fbc7f989c68aa9e07e1562fa.