Revert 36f4d2b..cec578e

This rolls back to commit 36f4d2b1a8b41bf0883b978a63b3686b97d57ad0.
report drafr2

report drafr2