Revert ba86ea9..bb5323e

This rolls back to commit ba86ea97cd7b3456c9dc11992d767e99b933da06.