Revert bff41ff..693c697

This rolls back to commit bff41ff73c3b10ae95e16e4c3567e09cbd32f24d.