Revert "Hybrid properties"

This reverts commit d96c36b0ade1fe99ae0f154a5e28725b798d9927.