Revert "so many properties..."

This reverts commit 3868674c3cc55ee83fb189256cce17f5f6bd1eb9.