This reverts commit 03dce24137c82caa04c215d983eac06a3edc084c. Signed-off-by: Eric Windisch <eric@windisch.us> Upstream-commit: 1bf5fcd911a7f773a1f6c7511e977d87cca5b391 Component: engine