Revert ff3c873..8725279

This rolls back to commit ff3c8737ae1d70e66d75ff7ae34c5e3de75de4a5.