Revert "Revert to last commit before fork: d285e32b7a"

This reverts commit 3dbec700beeb7719714c5e70d9034d9ba74b9e78.