Recommit for open-sourced-osity!