Revert "temporarily disabled custom attributes to improve performance"

This reverts commit f04b170d7c9f3692ce26770a177a711eec5d0cb2.