Revert "Merge branch 'Profile'"

This reverts commit 2dffbc3135415a79bd141239a72bd9e2e24ecebe, reversing
changes made to 533af9077bdf9288e336335f895afb257aca48f6.