Revert "Better handling for getActualProperty"

This reverts commit 22a47e3e29cd1225b72b2db8ff29a07a3041e113.