Revert 73a05d7..e744909

This rolls back to commit 73a05d7cec80b5eaac6d8cb9792678b5a09a4d9d.