Revert ece5091..18a1218

This rolls back to commit ece5091bcc44cd85093e20b70a9eef81bf243ed7.