Revert "Fix property on protoype instead of instance"

This reverts commit 07318ecffd5ddd9f991b07009a974ab1daeadeea.