buggy push of decorators for moment

Do not merge back into main repo until fixed! This is a push so Fabi
can take a look.