Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit d4acdbfc7ab123af7392d157da73a5f3f08aed4c, reversing
changes made to 13e063f8092823a8e0b395a78955ef4efa961a3f.

Reverted the latest two commits in order to restore the API to the last working state before the new modifications
Reverted the last two commits to restore the API to its last working state. Please do not make any changes to the master branch unless they have been discussed throughly with the MSE team.