Revert 21804c9..943fe9d

This rolls back to commit 21804c999e4c7d5dff94c932964fc3566c524624.