Reverted disatruous changes added erroneously from the native fork