Revert d258f94..8deb43d

This rolls back to commit d258f946d36461d88fdf7e731da5dff31c801954.