Revert "smultron: move common props"

This reverts commit 467dfd4946be958aa9432e57328dc8fc0570b1f6.