Revert merge from Mike's experimental branch (commit: e1ee8621b5ca6c6583362d2c11d18e93d80ab8b4)