Revert ece86ff..bc50ab3

This rolls back to commit ece86ffa9a2ae44bec1dad2bd8b5f87f233421a5.