reverted some scheme changes since they had an unexpected side effect