This reverts commit 17c47958. Turns out decorator performs some magic to support kwargs better than we do.