Build rollback of #26