Revert 1ff01b3..72d4900

This rolls back to commit 1ff01b387cb680f1e281c7af4223596befd2fd5e.